Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/2023.04.17 -> rc #480

Merged
merged 11 commits into from
Aug 21, 2023
Merged

Release/2023.04.17 -> rc #480

merged 11 commits into from
Aug 21, 2023

Conversation

dcuellar322
Copy link
Collaborator

No description provided.

dependabot bot and others added 9 commits August 21, 2023 11:15
Bumps [cryptography](https://github.com/pyca/cryptography) from 37.0.1 to 39.0.1.
- [Release notes](https://github.com/pyca/cryptography/releases)
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@37.0.1...39.0.1)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [redis](https://github.com/redis/redis-py) from 2.10.6 to 4.4.4.
- [Release notes](https://github.com/redis/redis-py/releases)
- [Changelog](https://github.com/redis/redis-py/blob/master/CHANGES)
- [Commits](redis/redis-py@2.10.6...v4.4.4)

---
updated-dependencies:
- dependency-name: redis
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [werkzeug](https://github.com/pallets/werkzeug) from 0.15.5 to 2.2.3.
- [Release notes](https://github.com/pallets/werkzeug/releases)
- [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst)
- [Commits](pallets/werkzeug@0.15.5...2.2.3)

---
updated-dependencies:
- dependency-name: werkzeug
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [sqlparse](https://github.com/andialbrecht/sqlparse) from 0.4.2 to 0.4.4.
- [Release notes](https://github.com/andialbrecht/sqlparse/releases)
- [Changelog](https://github.com/andialbrecht/sqlparse/blob/master/CHANGELOG)
- [Commits](andialbrecht/sqlparse@0.4.2...0.4.4)

---
updated-dependencies:
- dependency-name: sqlparse
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@battleoverflow
Copy link
Contributor

It looks like Docker doesn't work due to the MarkupSafe dependency not being compatible with the werkzeug dependency update:

The conflict is caused by:
The user requested MarkupSafe==1.1.0
jinja2 2.11.3 depends on MarkupSafe>=0.23
mako 1.2.2 depends on MarkupSafe>=0.9.2
werkzeug 2.2.3 depends on MarkupSafe>=2.1.1

I was able to build the Docker container by modifying the MarkupSafe dependency in requirements.txt:

MarkupSafe==2.1.1

I found the PR (pallets/markupsafe#304) where they removed soft_unicode from MarkupSafe, so we're getting this error when trying to run the container:

ImportError: cannot import name 'soft_unicode' from 'markupsafe' (/opt/threatkb/env/lib/python3.8/site-packages/markupsafe/__init__.py)

Unfortunately, that import isn't being used in our code, but instead in some of the dependencies we rely on. Can you make those changes and double-check everything still works from your PR? I think this may have a number of dependency issues to work properly. If you wanna try testing it in Docker, there's a wiki here.

@battleoverflow battleoverflow self-requested a review August 21, 2023 20:35
@battleoverflow battleoverflow merged commit b116288 into rc Aug 21, 2023
1 check passed
@battleoverflow battleoverflow deleted the release/2023.04.17 branch August 21, 2023 20:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants